Merge git://git.denx.de/u-boot-sh
authorTom Rini <[email protected]>
Fri, 16 Feb 2018 18:56:02 +0000 (13:56 -0500)
committerTom Rini <[email protected]>
Fri, 16 Feb 2018 18:56:02 +0000 (13:56 -0500)

Trivial merge